From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 17 Feb 2007 20:38:20 +0000 (+0000)
Subject: (pgg-gpg-process-region): Make USE-AGENT nil if PASSPHRASE is given.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~2091
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8e1a73f22004016d715f89d443771db75be48056;p=emacs.git

(pgg-gpg-process-region): Make USE-AGENT nil if PASSPHRASE is given.
---

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 84bf81a858e..a2cd14eaae3 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -61,7 +61,7 @@
   "GnuPG ID of your default identity.")
 
 (defun pgg-gpg-process-region (start end passphrase program args)
-  (let* ((use-agent (pgg-gpg-use-agent-p)) 
+  (let* ((use-agent (and (null passphrase) (pgg-gpg-use-agent-p)))
 	 (output-file-name (pgg-make-temp-file "pgg-output"))
 	 (args
 	  `("--status-fd" "2"